From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 5 Feb 2011 10:25:25 +0000 (-0800)
Subject: Merge from mainline
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~4685^2~60
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=4b8111ebb92f1415adfa35963d2711cf30bf8cf6;p=emacs.git

Merge from mainline
---

4b8111ebb92f1415adfa35963d2711cf30bf8cf6